Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 24 Mar 2010 06:29:13 +0000 (06:29 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 24 Mar 2010 06:29:13 +0000 (06:29 +0000)

Trivial merge